From 3cc7d9b8c0ec1428e81ec1c34881defb4e459231 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Jan 2021 23:34:06 -0500 Subject: [PATCH] Move the gesture icons in the right place Put these images into gtk/icons, where they belong. --- gtk/gen-gtk-gresources-xml.py | 7 +------ .../actions}/gesture-pinch-symbolic.symbolic.png | Bin ...sture-rotate-anticlockwise-symbolic.symbolic.png | Bin .../gesture-rotate-clockwise-symbolic.symbolic.png | Bin .../actions}/gesture-stretch-symbolic.symbolic.png | Bin .../gesture-swipe-left-symbolic.symbolic.png | Bin .../gesture-swipe-right-symbolic.symbolic.png | Bin ...ture-two-finger-swipe-left-symbolic.symbolic.png | Bin ...ure-two-finger-swipe-right-symbolic.symbolic.png | Bin .../scalable/actions}/gesture-pinch-symbolic.svg | 0 .../gesture-rotate-anticlockwise-symbolic.svg | 0 .../actions}/gesture-rotate-clockwise-symbolic.svg | 0 .../scalable/actions}/gesture-stretch-symbolic.svg | 0 .../actions}/gesture-swipe-left-symbolic.svg | 0 .../actions}/gesture-swipe-right-symbolic.svg | 0 .../gesture-two-finger-swipe-left-symbolic.svg | 0 .../gesture-two-finger-swipe-right-symbolic.svg | 0 17 files changed, 1 insertion(+), 6 deletions(-) rename gtk/{gesture => icons/64x64/actions}/gesture-pinch-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/64x64/actions}/gesture-rotate-anticlockwise-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/64x64/actions}/gesture-rotate-clockwise-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/64x64/actions}/gesture-stretch-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/64x64/actions}/gesture-swipe-left-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/64x64/actions}/gesture-swipe-right-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/64x64/actions}/gesture-two-finger-swipe-left-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/64x64/actions}/gesture-two-finger-swipe-right-symbolic.symbolic.png (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-pinch-symbolic.svg (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-rotate-anticlockwise-symbolic.svg (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-rotate-clockwise-symbolic.svg (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-stretch-symbolic.svg (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-swipe-left-symbolic.svg (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-swipe-right-symbolic.svg (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-two-finger-swipe-left-symbolic.svg (100%) rename gtk/{gesture => icons/scalable/actions}/gesture-two-finger-swipe-right-symbolic.svg (100%) diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py index 8072eee9f4..0404bef758 100644 --- a/gtk/gen-gtk-gresources-xml.py +++ b/gtk/gen-gtk-gresources-xml.py @@ -63,17 +63,12 @@ xml += '\n' for f in get_files('theme/HighContrast/assets', '.svg'): xml += ' theme/HighContrast/assets/{0}\n'.format(f) -for f in get_files('gesture', '.symbolic.png'): - xml += ' gesture/{0}\n'.format(f) - -xml += '\n' - for f in get_files('ui', '.ui'): xml += ' ui/{0}\n'.format(f) xml += '\n' -for s in ['16x16', '24x24', '32x32', '48x48', 'scalable']: +for s in ['16x16', '32x32', '64x64', 'scalable']: for c in ['actions', 'categories', 'emblems', 'emotes', 'devices', 'mimetypes', 'places', 'status']: icons_dir = 'icons/{0}/{1}'.format(s,c) if os.path.exists(os.path.join(srcdir,icons_dir)): diff --git a/gtk/gesture/gesture-pinch-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-pinch-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-pinch-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-pinch-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-rotate-anticlockwise-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-rotate-anticlockwise-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-rotate-clockwise-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-rotate-clockwise-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-rotate-clockwise-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-rotate-clockwise-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-stretch-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-stretch-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-stretch-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-stretch-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-swipe-left-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-swipe-left-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-swipe-left-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-swipe-left-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-swipe-right-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-swipe-right-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-swipe-right-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-swipe-right-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-two-finger-swipe-left-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-two-finger-swipe-left-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-two-finger-swipe-left-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-two-finger-swipe-left-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-two-finger-swipe-right-symbolic.symbolic.png b/gtk/icons/64x64/actions/gesture-two-finger-swipe-right-symbolic.symbolic.png similarity index 100% rename from gtk/gesture/gesture-two-finger-swipe-right-symbolic.symbolic.png rename to gtk/icons/64x64/actions/gesture-two-finger-swipe-right-symbolic.symbolic.png diff --git a/gtk/gesture/gesture-pinch-symbolic.svg b/gtk/icons/scalable/actions/gesture-pinch-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-pinch-symbolic.svg rename to gtk/icons/scalable/actions/gesture-pinch-symbolic.svg diff --git a/gtk/gesture/gesture-rotate-anticlockwise-symbolic.svg b/gtk/icons/scalable/actions/gesture-rotate-anticlockwise-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-rotate-anticlockwise-symbolic.svg rename to gtk/icons/scalable/actions/gesture-rotate-anticlockwise-symbolic.svg diff --git a/gtk/gesture/gesture-rotate-clockwise-symbolic.svg b/gtk/icons/scalable/actions/gesture-rotate-clockwise-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-rotate-clockwise-symbolic.svg rename to gtk/icons/scalable/actions/gesture-rotate-clockwise-symbolic.svg diff --git a/gtk/gesture/gesture-stretch-symbolic.svg b/gtk/icons/scalable/actions/gesture-stretch-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-stretch-symbolic.svg rename to gtk/icons/scalable/actions/gesture-stretch-symbolic.svg diff --git a/gtk/gesture/gesture-swipe-left-symbolic.svg b/gtk/icons/scalable/actions/gesture-swipe-left-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-swipe-left-symbolic.svg rename to gtk/icons/scalable/actions/gesture-swipe-left-symbolic.svg diff --git a/gtk/gesture/gesture-swipe-right-symbolic.svg b/gtk/icons/scalable/actions/gesture-swipe-right-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-swipe-right-symbolic.svg rename to gtk/icons/scalable/actions/gesture-swipe-right-symbolic.svg diff --git a/gtk/gesture/gesture-two-finger-swipe-left-symbolic.svg b/gtk/icons/scalable/actions/gesture-two-finger-swipe-left-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-two-finger-swipe-left-symbolic.svg rename to gtk/icons/scalable/actions/gesture-two-finger-swipe-left-symbolic.svg diff --git a/gtk/gesture/gesture-two-finger-swipe-right-symbolic.svg b/gtk/icons/scalable/actions/gesture-two-finger-swipe-right-symbolic.svg similarity index 100% rename from gtk/gesture/gesture-two-finger-swipe-right-symbolic.svg rename to gtk/icons/scalable/actions/gesture-two-finger-swipe-right-symbolic.svg -- 2.30.2